fix git issues #78
Open
fix git issues #78
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
BartBucknill
requested review from
maxgerber,
rachaelcodes and
rebecacalvoquintero
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The latest pull request that we made intended to fix our git issues was for
finishing-touchesbranch, but this was problematic as it overwrote changes in dom.js and logic.js, and if merged would have reverted them to an earlier state.In order to fix the problems we were having with git I did the following:
finishing-touchesbranch locallyfix-git-issue) from masterfinishing-touchesbranchI have tested this branch locally and it works and looks OK. The only problems I find are:
the fileLondon-tube.ttfis missing from this branch, and as it is referenced in our app this causes an error in console. I can't locate this file. If someone else has it, perhaps they could add it to this branch before merge?I realised that the font was actually in the
finishing-touchesbranch, so I've added it tofix-git-issues, and I have removed 3 unused images files (fire and underground).on small screens the button container is noticeably off centre, and some of the line names get cut off rather than wrapping. I'm not sure if there was already a fix for these issues in one of the other branches? If so, perhaps we could just add it to this branch before merging?